Improve filter exclusion setting for shade plugin #17824
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
apc999
changed the title
Xenorith
requested changes
Jul 24, 2023
There was a problem hiding this comment.
i checked the other ufs module pom.xml. for the ones with a dependency on alluxio-underfs-hdfs, their shade plugin configuration usually contains this filter entry:
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
<exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
the following diff makes them all consistent:
diff --git a/dora/underfs/cephfs-hadoop/pom.xml b/dora/underfs/cephfs-hadoop/pom.xml
index 89d409a60c..fccb21bee9 100644
--- a/dora/underfs/cephfs-hadoop/pom.xml
+++ b/dora/underfs/cephfs-hadoop/pom.xml
@@ -64,6 +64,7 @@
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
<!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
+ <exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
diff --git a/dora/underfs/ozone/pom.xml b/dora/underfs/ozone/pom.xml
index 8babf6aae2..9b9411c53a 100644
--- a/dora/underfs/ozone/pom.xml
+++ b/dora/underfs/ozone/pom.xml
@@ -147,6 +147,8 @@
<filter>
<artifact>org.alluxio:alluxio-underfs-hdfs</artifact>
<excludes>
+ <!-- Because this module depends on alluxio-underfs-hdfs, eliminate HDFS factory implementation -->
+ <exclude>alluxio/underfs/hdfs/HdfsUnderFileSystemFactory.*</exclude>
<exclude>META-INF/services/alluxio.underfs.UnderFileSystemFactory</exclude>
</excludes>
</filter>
|
@Xenorith comment addressed. PTAL |
Xenorith
approved these changes
Aug 14, 2023
|
alluxio-bot, merge this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes are proposed in this pull request?
dora/shaded/client/pom.xmlto eliminate some warnings in the shading process.dora/underfs/pom.xml, enabling us to reduce duplication by moving the common settings todora/underfs/pom.xml.Why are the changes needed?
Code hygiene and readability
Does this PR introduce any user facing changes?
No